From 2c7d8b013b35814cca85180ef68539f4ff42c5bb Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Sun, 6 Apr 2014 17:04:00 -0700
Subject: [PATCH] ChangeLog fix

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1ab59f58fc..d2987364fa5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1942,7 +1942,6 @@
 	* net/shr.el (shr-tag-img): Prefer the title over the alt text
 	(bug#16537).
 
->>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
 	* net/eww.el (eww-download-callback):
-- 
2.30.2